bitkeeper revision 1.539 (3f9fee97LmrWncvzqKoEIzrY9jj3TQ)

more mergey fun

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 4ada23afb01635458111d386db6eacf889bcf5da..e51474b789e8d69988aceff9154648cc33b4940f 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -472,3 +472,5 @@ xen/drivers/net/dummy.o
 tools/misc/miniterm/miniterm
 tools/misc/xen_read_console
 extras/mini-os/h/hypervisor-ifs
+xen/BLOG
+xen/drivers/block/xen_vbd.o

diff --git a/xen/include/hypervisor-ifs/block.h b/xen/include/hypervisor-ifs/block.h
index f009bbc468c8f565b6eafbb12a5b22ddf70a8f38..9f4a72cfc17e0259c21b33a7db58c9fba3935819 100644 (file)
--- a/xen/include/hypervisor-ifs/block.h
+++ b/xen/include/hypervisor-ifs/block.h
@@ -8,14 +8,6 @@
 #ifndef __BLOCK_H__
 #define __BLOCK_H__
 
-/*
- * Command values for block_io_op()
- */
-
-#define BLKOP_PUSH_BUFFERS   0  /* Notify Xen of new requests on the ring. */
-#define BLKOP_FLUSH_BUFFERS  1  /* Flush all pending request buffers.      */
-
-
 /*
  * Device numbers
  */

diff --git a/xen/include/xeno/sched.h b/xen/include/xeno/sched.h
index 8923a8a56de1acf49fb025a9c663cc7608854952..bd517f9e977a9946bf4a3d0defdc74ee51f5a604 100644 (file)
--- a/xen/include/xeno/sched.h
+++ b/xen/include/xeno/sched.h
@@ -63,8 +63,7 @@ extern struct mm_struct init_mm;
 #define PF_CONSTRUCTED  0x8  /* Has the guest OS been fully built yet? */
 
 #include <xeno/vif.h>
-#include <xeno/block.h>
-#include <xeno/segment.h>
+#include <xeno/vbd.h>
 
 /* SMH: replace below when have explicit 'priv' flag or bitmask */
 #define IS_PRIV(_p) ((_p)->domain == 0) 
@@ -145,7 +144,7 @@ struct task_struct
                                       the process can do raw access
                                       to. */
     spinlock_t physdev_lock;
-    segment_t *segment_list[XEN_MAX_SEGMENTS];
+    vbd_t *vbd_list[XEN_MAX_VBDS];
 
     /* VM */
     struct mm_struct mm;

diff --git a/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h
index 57a0e30d7918d7a4bf97f43b4eea53c750213d74..285319ab6ac9ff208f97ffcbe628dff10551f4c5 100644 (file)
--- a/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h
+++ b/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h
@@ -282,13 +282,13 @@ static inline int HYPERVISOR_network_op(void *network_op)
     return ret;
 }
 
-static inline int HYPERVISOR_block_io_op(unsigned int op)
+static inline int HYPERVISOR_block_io_op(void * block_io_op)
 {
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
         : "=a" (ret) : "0" (__HYPERVISOR_block_io_op),
-        "b" (op) ); 
+        "b" (block_io_op) ); 
 
     return ret;
 }